Skip to content

Improve test_merge_conflict via new prompt_yes_or_no #147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JohanMabille merged 3 commits into from
Apr 28, 2026
+100 −21

We went looking everywhere, but couldn’t find those commits.

Sometimes commits can disappear after a force-push. Head back to the latest changes here.